Add a unit test to help verify 588