Some cleanup and additional test.