Unit tests

Created the following branch for increasing the project coverage by adding more unit tests.