fix build
refactor into insertion/extraction classes
fix build when running specs independently but some shared state when executing all in one run.