instruments server tests, needs refactoring