Changing arhcitecture of running tests

think about it