fixed a couple of tests