Fixing some tests and providing better output in system test case failure.