fixed a few unit tests