@gyst shouldn't these test methods from here on read "test_no_expand_XYZ"? the expand parameter is set to False...