Updated test cases where specific Python version 2/3 features were important
Deleted files