Added some unit tests
Removed warning
Merge branch 'development'