refactored tests project