Cleaned up models (removed tuple lists)
Testing courses