Fixed test.java, finished daos