Fixes for automated tests