Updates for automated tests