(#1505) - Make errors in tests clearer