FIX: Proper tests