Fixing issues with Tests

Fixing a few different tests that are currently causing issues, and the occasional instrumentation failure.