Add all the missing test data.
Added more criteria. Kind of a weird usecase, but I'm sure it exists.
Speed up service test by inserting a dummy X-Session-ID header.