reverted to map for tests