Update unittest case to use unit.base, increase code coverage