PDB-341 Some more work

Signed-off-by: Ken Barber <ken@bob.sh>
PDB-341 Remove custom get-requests from each test

Signed-off-by: Ken Barber <ken@bob.sh>