Brought in more tests after major re-factoring of facet code.