- Removed strlen usage - Added unit testing to protect the change - Fixed some bugs found with the unit test