Remove dict, add things.
Fix examplecode.tst