added new libraries and test code