Brought back lots of commented-out tests