adapted test to code/behavior changes