Cleaned tests and made sure the use cases were covered
Merge branch 'master' of https://github.com/CMPUT301F14T04/Funtime-Runtime-Project