Fix test case, simplify options creation