Fix the failing cucumber scenaiors