Continued work on Rules packageand tests