Attempted fix of threading issue in test.
Fixed toxav issues.