#502: add new tests