moved all but 2 tests out of the way