Update tests to pass