Clearing up what appears to be some synchronisation issues in the QA test suite, replacing ArrayList with List and HashMap with Map.