New tests added, see 6 and 7. All tests passed