tweak regex a little bit + add an additional test