Remove unused code and reformat
DAO layer test