Updated Steps + Tests to fail faster.