Algorithm Improvements; Unit Testing Project