FIX: More complete context testing