partial completion of tests for #33