Fix repeated classes in step definitions