Remove some leftover debug crap.
Add the start of testing.