Added search though steps + unit tests