Improving test reliability

Assertions were made against flags
not certainly be true due to concurrency