Added first-level policies and rules as well as a few other tests that were missing