- Tweaked optimization function interface again
- Some unit test