Clean up test suites

* add skips
* remove references to production files