more unit tests converted