Got some facet tests done! streamlined some more code.