Test fixes for literal maps