Moved ch2 test file into test directory