Wed Feb 20 04:16:25 MST 2013 - Fixed memory leaks. Expanded test cases to accomidate failures