Moved TriggerOverlap test queries into main test block