Rename test classes to provide for fine grained test runs