Issue 470

This PR is related to Issue #470. I added and changed some reules and some tests. Not all founds mismatches from the Issue were fixed.