Fixed unit tests
v0.2.4