added test name support and a more sophisticated map case.