Cleaned up Model Testing