Fix a couple of jsHint warnings
Failing test showing problem with order of nested models