Fixed remaining test.
Better error messages