Typos and test code tags fixed