More tests and merging