Removed old tests, added new