Killing bugs, fleshing out existing tests