Add server side tests, makefile, etc
Tweaks to makefile
Merge pull request #1 from dberesford/master

Server side tests added