Split tests apart and fmt