ENH: expanded tests
ENH: expanded tests