Some refactoring and moving doc runner
Reverting spec to it's old version
Refactor the runner