remove cached state and fix up png tests