Setup and teardown of sample data now automated