refined tests for trainer
modified tests for new structure
merged tests