Uncommented more tests.