Test update WIP.

- Some tests are still broken.
- Will be amended.
- Issue #1 has reappeared—the tests were bogus.