Fixed pyflakes warning
Removed all updated GCAL (class-based) models from 'unopt' tests