Fix compile error on e37 add more tests.