Work to get a controller test working again. Only partial success.