Updated test harness to not look like barf.