Break out tests a bit