Improved tests (for server)