Update tests for attribution.
Add tests.