Test compliance changes
Lots of tests (incomplete)