- fixed failing test by re-arranging the execution order. This is weird and worrisome. But I couldn't find the root cause for this behavior yet.