#17 new tests