add more tests. fix build failure