Fix method call to substr(); make return values more consistent
Finish test