Refactor tests in prep of splitting up