rollback test. refactor.
fixed a hidden error.
Api object is now stateless
Merge branch 'release/0.6' into develop