Rolling back change and adding test