FIX: Adding test