Update tests to match breaking changes