CB-7148 Added manual tests