Fix intermittent test failures
Change remaining instances of HashMap to LinkedHashMap