MAINT: expanded tests