Merge "Add tests for various RRSet types"