bugs fixed in tutorial's tests
merged conflict in tutorial's tests
merged conflict in tutorial's tests (again)