1. Added some unit-tests.