Fixing all broken tests. In some cases, timeouts were not correct. In an...

...other, I placed a weird hack for when our ref counting seems to be incorrect