First attempt to fix server tests