Separated out the test harness, some reformatting