Remove an old TODO.
Overhauled the tests a bit.
Add forking.