Cleanup unused imports, fix unit tests
fixup PHP example code
Update .iml