New tests added, some old ones modified.