Replace old test with new integration test