Continued to refactor some pre-existing tests