Unbork deletion of access points and add a test