Updated trim regex (cleaner now) and tests