start to refactor new project functionality; more tests