fix tests
change logic to new behavior