v0.0.5 bug fixes and unit tests