Add some tests, use whole word REGEX instead of .contains
Fix merge error