DRY
Break out tests into multiple files