Starting to flesh out tests