Added tests to test project
Merge remote-tracking branch 'origin/master'