Gets some more facet tests running and passing, makes some more things internal.