Fixes for custom WebPagetest instances

Specs still pass.