Optimize and clean implementation

[petreze]

This task aims to clean up the implementation after all tests are refactored. This might include creating custom annotations to provide essential behaviour to all tests or encapsulate recurrent logic into util class also some things that might come up later as better approaches