Updates according to review and added broken flow test