Further cleanup and actual asserts for the statistical test