Add tests.
Merge branch 'change/tests' into staging