FIX: Deal with borked test dataset