Oh sweet mahavishnu, some more tests pass.