Tests now compile and run successfully after directory restructuring