[test] Major cleanup