Fix for several tests failing