ENH: expanded tests