Added Test for new functions