server fixes for model and tests