Optimizer: more tests