Fix failing unit tests

Nevermind. I just saw your commit message.