add more tests (including two that appear to surface bugs