update dump defintions and declaratiosn code
more tests