Getting trouble with test cleanup
Fixed up false positive errors for test
Merge branch 'master' into dev/break.it.down