More tests, and fixed bug that caused facet options not being overwritable