Test Fixes - These tests must be synchronous