removed _findIDMatch workaround
* Removed workaround (function _findIDMatch) which was caused by a greedy match in quotes. This lead to too many matches
* Removed trailing spaces
* Added some tests