[axof: 2 wl: 30 mins]
Initial tests for Student question. Also did some refactoring