Refactor server specs for increased coverage