Rebased Rules, tests, and gemspec to resolve conflicting merge changes