More clean up and better tests.'