Specified source and test directory. Minor test modification