TOOLS-304: add tests