Added back the commented tests