unit tests extended.