RFC 8

Simplified ServerQueue and added test servers file to increase code coverage.