Code cleanup, removed test from name