Port over acceptance tests from master.