cleaned up indentation, removed problematic cucumber scenarios untill further