Refactor brittle tests

I'm using this PR to trigger Travis builds as I work on cleaning up our brittle tests. I'll merge once I've worked on every spec listed in Issue #97. Please feel free to add additional items to that issue as they are discovered.