minor changes in rules and testing