This entire class is commented out. Can we enable these tests?