Bumped version and fixed some tests
Merge branch 'release/v0.6' into develop