Hopefully fixed auto test issues.