Tests renamed and tabulation fixed