Refactored comment tests into separate files