Pulled test out into proper unit test