Moved old tests across