updated tests for #22