#63 Fix some of the Functional Tests for student