#513: add new tests