JC-1817 Reworked unit test: all test specific data is keeping localy now. Fixed indentation.