Removing Core_ from test class names