Remove test properties from all tests
Remove properties that I missed
Found a few places where my find and replace didn't work
Re-add a property that is actually used
Add more actually important properties
Merge branch 'master' into phosphoer/remove-test-verify
Re-add two timeout properties that may be useful
Merge branch 'phosphoer/remove-test-verify'