More tests + refinements from creating those tests