add dict expand and some tests