Added further statistics gathering and output to test case