Merge pull request #625 from ebarboni/includetests

url fixes (bz, apidoc) + test for macro