Remove test from names of non-test methods