Readded a bunch of mistakenly commented tests