Improve tests for multisite