Showing current test step and improved test code and style