Added unit test
Merge remote-tracking branch 'origin/UnitTesting' into UnitTesting
Added another unit test