fixed merging of test-functions