CB-7146 Added manual tests