add more tests, fix breakages