FIX: Cleaner testing