Finished for now clean-up of training and testing

Fixed bug in parallel.py as well.