Small fixes to get Testing code running - some type confusion