Merge remote-tracking branch 'origin/nigel'
Reset the test cases

Also moved all test cases into one folder
Merge branch 'master' of https://github.com/Winston-Chan/CPSC449