[FOLD] Cleanup unit test