move more unit tests