Added string subs
Tests and comments addressed