US5996 Test fixes and new tests