End of class 1.1. More context, more tests