Added test case and new libs