Refactor unit tests

- Really no way I can think to pull up the base dao stuff, so will just have to follow a pattern in the unittests