Updated rule messaging and added extra tests