Moved unit tests to modules