Added tests from Scott's PIC tests