(#7) Fix some failing tests as a result of
c1a9d551db724ed9a65bb49b8bea58287d9aca9f.