Fixed two failing tests
Merge branch 'master' into hoyt