Fixed Server Unit Tests