Convert test to automated suite
Attach keys to the regexp result

Closes #17