Patching all specs to be finally passing before next big step [30%]