Add expr6 and more tests.