imporved tests
Changed files to proper extension
improved main regex to be not greedy