Spaced out tests and gave them better abstract names