fixed more unit tests