Updating test to be more idempotent