Added some tests
Merge origin/master
Merge origin/master
Commit for refactorization