Last missing rename
Bumped pods to Taptera style
Some small updates to tests to reflect more modern style