update test to new logic too