CB-6964 ported manual tests

Fixed up style