Changing arhcitecture of running tests

and this not needed anymore