Added libraries and testing