Removes the conflict with the testing suite.
Finished the 305 handling.