Fix test file. Evan work is commented out!