1459: add unit tests