More HashMapontroller testing, still more to do