Pull out tests into tests.py; they're passing.