Reviewed r/1841
Continued work on automating smoketests