Update one test to match the new behavior, add more tests