Sorry for no response, haven't been having issues and forgot to update. I stopped engaging the lock and no longer have issues. I figured when the dealer was testing for drain they had no reason to lock it. Not sure why it was draining the battery, but at this point I'm just happy its functioning.