Fix Exception, List, Map to using Test Automatic