Started unit test class.
Merge remote-tracking branch 'origin/tests' into tests