fixed executor and test files