Fixed tests to run against master.