added back more tests.