Add test and code files for carriage and train