Created/improved train and test modules