Comments, and move code that identifies tests into is_test