NSDictionary test + fixes for NSDictionary