Add htaccesrouter & improve unit tests