Added substitution model spec, and fixed a few other failing specs as a result of changes to player validations