(#1549) - add more tests