Added test server and added support for marginalia.