GS-11239 Test refactoring
GS-11239 Fix indentations