WIP: tweaking CommonMapTests setup