Some renaming and moving to old_tests