Fix unit tests failing