moving around some test names