Update include lib
Update for pwf-1.7
Main include file
More tests