Evaluate and Fit to return the same output format, training and validation loss now in sync

Created by: scarlehoff

This fixes a number of TODO that were left around the code (first commit) and issue #616 (closed) (second commit).