some renaming and better testing at the end of training