Changing arhcitecture of running tests

remove