Flesh out tests a bit more