moved more unit tests