- Fix failing unit test
- improved build configuration