Merge "[RIFT 16414, 16415, 16416] Unittest fixes to conform to the new package struct...