Clean up & refactor of fasta-testing code