add a couple of tests
roll back part of fix for #512