Changed paragraph marker removal to include interpretations, added more tests