got more unit tests working