Preliminary changes to accommodate automated testing