Fixes tests which were broken by previous commit