Omnibus update, first pass at framework to allow proper regression testing in future