HBX-1225 Test case to demonstrate failure case and correction, and fixes to test cases demonstrating the corrected generation works