Update tests and separate spec helper methods into files