Added unit tests for new DAO methods