fix variable name, add a few asserts to test
Refactor output of trainer to be a little more friendly for prediction