add test_comm
update location of files
fix class names