add new rules, a test and a new android