New test added, some old ones modified.