Update tests to pass on master