- Several cleanups
- Added unit test for runtime options overwriting