Changed the tests so that they work with the Map<K, V> refactor.

Change-Id: I53631420b33b7bbd7462a5ff2a2c8401655bc64c
Signed-off-by: Filip Wieland <filiplamparski@gmail.com>