refactor once more to get tests working
Merge branch 'master' of github.com:lpave/refueling-crawler