Unit test fix. Needs more investigation.