NAS-2309 Mock usage of DAO in all non-DAO unit tests: Moved 2 first real unit test classes to main module. Adding JUnit4.