WSOTWO-132: Added unit tests for some classes