Fix tests to reflect trapperkeeper changes