Fix test and module including