Integration pr

This is rearranging to two `ignore`s to mirror eachother, and making more effective use of pytest features.