review follow up, move away from * in Options and use it at least once in tests