Large service/session improvements/refactorings and faster tests

- Also prepares for SauceLabs support