Changing arhcitecture of running tests

do reformat code