Added ArgMap and more tests.