Clean up several tests for greater consistency (#267)