Updates to testing files.

Various changes to the testing files to ensure all rules are covered.