Hax to get test suit working again.