Fixes automated test bugs