#523: add new tests