Adds test fixes for enttest regression.