New tests added, some old modified.