Removed old tests
Moved new tests