Fix tests corresponding to changes in amd-to-closure