simplified test directory and updated test readme