Removing usused library
Unit test updates