Remove duplicate code from acceptance tests.

Just cleaning things up here.
5 files changed