#525: add tests