Minor cleanup of f5 test