HHH-7996 Added use of TinyBundles
HHH-7996 corrected minor CL issues found during unit test