Cleaned up testing classes