[PATCH 0/2] Additional OVAL testing and cleanup