Minor template fix

If offset is dropped, span6 should be used.
Handle rename of get_primary_address to primary_address

Tests should now pass.