renamed test to what it tests
removed old cruft