some revisions to building/testing