Adapted test to modified code