Add Test Suite and fix lib issues