Added some tests
Merge origin/master