Changes to remove EMPTY from output tests