Rename some class names
Reset Riesz-map cache before each py.test