Cleaned up Category- amd Backlinkqueries; added tests