fixed a couple of failing tests