Move tests from extra in the new system
Fix tests