Switch existing tests to use a new style

Remove unnecessary local vars, typedefs, namespaces, and templates specialization from tests.
Convert tabs to spaces
Merge pull request #11 from ValeriyKopylov/test_restyling

Test restyling
fix bug in map