Revert ProjectFunction
Modularizing access to database
Test evolution
Refactor
Refactor
Changes in test files