Remove unneeded regex grouping
More hacks for custom file

Also improve test descriptions