Added more testing methods

These tests pass! They test for one client and server and for many
clients and one server. They are all run on the same machine and I
haven't tested accross machines yet
Merge branch 'master' of https://github.com/CameronProbert/SWEN222Project.git