more adjustments needed for tests