Separated out tests into individual files