Fixed few unit tests