fixed errors in rule and updated rule tests
merged Card