#233 UT repackaging and isEmpty improvement

-