few fixes post-sanity testing
added server tests (exciting!)