More steps taken to facilitate automated testing