New tests, fix previous tests, generate output table looks better.