Some test tweaking to ensure proper test execution order