Added some tests.
renamed package name
Merge branch 'develop'