CI fixes and adjusted tests due to Jira bug fixes