Refactoring a large portion of tests - necessary updates to have them working (may still be timing issues on the smoke build)