Moved tests into individual files