Update tests.
No need for top-level functions.
Make tests pass.