move test to use new naming scheme