Fixed a couple of failing unit tests