#506: add new tests