fix unit tests to match new behavior