Fix failing unit tests
0.2.0-SNAPSHOT