* Fixes #2225 * A bit of extra cleanup * forgotten file * Make this thread safe and add support for v3K mol blocks * add the file * update expected results