Fixed issues with creation of test and class files in seperate directory branches