Actually allow sites to set enabledFrom and enabledTo in the model; also updated unit tests to reflect site matching more accurately.