Found a bug and fixed some tests to validate the bug is fixed.