Eliminate notices; add tests.
More tests.