#50 Added unit test and moved string replace so it only happens when it's using in a Regex