Clean up step names and remove defunct tests