Added extra unit-test