patch a few missing tests, deprecate server model, fix a few bugs