Cody's fixes for lambda tests + some of my own. Homogenized test names