Fixed more failing unit tests