Fixed a warning that was generated because the formatter in the sscanf call didn't specify the correct size.
Added some tests and cleaned up some outdated code.