Moved some classes over to the test section.