Put back in accidentally uncommented stuff.
Remove accidentally committed changes.
Test fixes.