Closes #1350 - fixes other tests
Closes #1350 - even better fix