adopting tests to new behavior