Fixing up ajax tests as per moved templates