Adding missing tests

Adding missing tests to improve code coverage.

Related to #54