move this logic back to where it should be
udpate test fixtures