Step target tests have correct numbers and updated layout