adapting the tests to the current project
adapting to actual project