fix tests, clean ups
dump structure