a couple of more tests. fixed a couple of defects.