Code cleanup. Dynamic call of tests