BS-7159
Fix grammar
BS-7159
Fix grammar
Fix orga tests