Got both dump and tree to 90% coverage