Feature/modernizize testing