beatrix: trivial cleanups in test

Signed-off-by: Pierre-Alexandre Meyer <pierre@mouraf.org>
server: trivial cleanup in test

Signed-off-by: Pierre-Alexandre Meyer <pierre@mouraf.org>