Fixes tests for autobuild