Fixed more unit tests