Covers issues from CR-ClassRequestTool-7