wn31 in test data
a bit more detailed error messages
use ConcurrentHashMap
slightly improve concurrency