More Deux fixes

Also created a test program