Ignore me. Want to see what kitty says

This shouldn't be considered for inclusion. It contains the commit from PR #68 and #70 because I want to see if commit 579cf06 fixes the spurious tests