Remove test that fails inconsistently, waiting on more info about it
Tweak tests
Merge branch 'develop' into staging