Optimizer: fix issue #50. TestOptimizer: add new tests
utest: minor fix