move this test to the right place and clean it up