FIX: Remove testing