Cleanup after merge, more tests