Added server tests
adds system.out.printl statements to several classes for debugging purposes
Fixing merging problems
Fixed testing errors