Removed some tests, restructured others