Merging in tests