Damkjaer PR, squashed and simplified

Squashed @damkjaer and @thpdbc commits, moved to testing frameworks used in the rest of the test suite, and tried to remove what seems to be an extraneous layer between the DOManager and the map if ReentrantLocks