Cleanup broken build

While getting this spun up locally, there were some issues running tests and Mac env related problems. This PR gets things up to snuff for further development.

/cc @ymendel @tnm