A few fixes
New test example