Cleaned commits and skip LONG flush test