Added testOptimizer tests and testLift and testDrag
Merge origin/master