small edit to StudentTest
merge conflict