all tests finished
merged