I have submitted a pull request with a separate commit for each of these four. The first three include tests which only pass after the change.