Revamped more tests.