Moved control on methods up to Test, and performance record to its own file