FIX: Some Minor Test Issues