Moved unit tests