Fixed data and checks for a few tests.
remove debug output, change error message text