Changed some test to confirm with us not wanting to mock as much as before for several reasons