#1560 - unit tests