Minor server fix and tests