Refactoring. Added empty test project.