fixed unit tests
0.6-Snapshot