Merges tests to master