removed Maps, VisibleForTesting (made as comment)