Added border to differentiate adjacent matches
Added hexadecimal tests