updated spec-runner, removed unecessary includes