#185 Made enhancement + fixed a student routing test