Trim down test class names
Reinstate py versions