wat.. BEGONE STUPEED
break existing test expectations out into seperate tests.