Another fix for unregistering array of keys
Test fixes