Merges tests into the 0-setup branch.