fixed failing server tests