fixed a couple of unit tests