Improve class8 exercises
Fix class8 exercise7 spec