Minor improvement; forgotten UT file was added
Build fix & cleanup