Add some more tests cases (including one which creates a map object)