Improve testing structure; more logging. Small fixes in meta/lock files.