fixing #753

Should fix the issue for terms. Unit tests passing. Special note, I had to add to your test data object, I hope this doesn't cause you issue with integration tests. Fixed one knock test also.