FIX: Cleaner tests