fix regex for tests - to be refined, but mostly working