fixing server tests after new refactoring