fix broken test and add additional tests for #325