Fleshing out tests