Added extra unit tests