Bug 1020614 - Move most options into a single object, passed through test framework;r=davehunt