Fixed test directory structure to match the rest of the directory structure, updated some test class names.