Uncomment tests. Fix test.