Downgrade back to reflections 0.9.8, fix some tests