Move helper methods around. Cleanup spec helper and create unit test helper