Merge "nn: fix race condition in execution tests"