Add some error throwing to tests to catch why they are failing