Fleshing out some tests