moved invocation of tests to proper place
rm