Removed old tests, added some new ones