refactoring test cases
Fixing api tests
Merge branch 'GUIBranch' of https://github.com/hhrosvick/seng403-W2013 into GUIBranch