Minor fixes, all four new tests passing on 5.2.x