Added tests based on user forum issue.