Add collection test (and test server support)