Finish up refactoring tests