nodeify expandSimpleQuery and expandGroupID, add test for addDefaultPrefix