Merge tests into master.