Move to a unit tests scheme, clean up pods