expanding test suite, adjusting behaviour and noting future work