server-side tests ready for turn-in
Merge remote-tracking branch 'origin/master'