More tests replacing server-side integration tests