Changing arhcitecture of running tests

to separate commit, please