Refactoring second test harness view to be awesome...