More progress, now test 21 fails
All appears to be working