Some additional cleanup

I love tests.