Added test for and fixed entrySet, keySet, values