Added CI fixes and new scenarios