Train and test added (Test not finished)