Bug fix for latest server crash. More tests.