implementing tests for decorator and cleaning up codebase
small changes