Efficiency Improvements and Discovery of New Substrates for a SARS-CoV-2 Main Protease FRET Assay