added unit tests
v 1.2.0 released
Revert "v 1.2.0 released"

This reverts commit 46889e79ef628e2de16f847a351a8a2c94fd6527.
Merge develop
v 1.2.0 released