Updated tests for new ruleset