Update tests to match changes