Added test.text for testing
Changed diff tool to meld