#529: add new tests