fixed merge errors in test files #9

Closed mehersam closed 6 years ago