fixing tests to match new behavior