#498: add tests