added extra unit tests