Refactoring, moving test to depreciated project