Fixed one test. Uncommented others