GitLab

* update

* add test

* address review comments

* update

* fixes

* change decorator order to fix tests

* try fix

* fight tests