cleanup some test naming