#11: Added unit test for new functions