'fixed' an issue causing all unit tests failing