more house cleaning:

  removing some unrelated exploratory testing
more house cleaning:

	* improving readability of tests
	* cleaning up test setup