fixing tests, and removing (for now) tests that will never pass