FIX: Add tests