Fixed code and tests after previous refactor
Updated project file