Minor bugfix and tests of concurrency...