Changing arhcitecture of running tests