Refactor live tests

Rewritten live tests.

Doing the PR from a branch in the official repo so Travis CI runs the live tests that this PR is about.