Merge new tests into master