Add tests for non-generic use of Map