Fleshing out more tests