Fixed data and checks for a few tests.