Continue fleshing out tests