Unit Test Fix

This also works for ee-6.1.x