WIP rewrite use regexp to extract multiple delimiters
Splits tests from code