Dao and JUnit updates for MySQL 5.5