Added some stuff to the test, which works now.
Merge branch 'master' of https://github.com/pmsc73/cs3716.git