Remove the need for PGMethod id as a arg and fix test