3 classes, Test Challenge 1 and most of 2

Something happened sorry.
This is the third time I have tried to submit a pull request.
Hope it works, thanks.