diff --git a/t/Session/Style.t b/t/Session/Style.t
index 2bd1cd2cc..982d5385e 100644
--- a/t/Session/Style.t
+++ b/t/Session/Style.t
@@ -11,11 +11,13 @@
 use FindBin;
 use strict;
 use lib "$FindBin::Bin/../lib";
+use HTML::TokeParser;
 
 use WebGUI::Test;
 use WebGUI::Session;
 
-use Test::More tests => 7; # increment this value for each test you create
+use Test::More tests => 21; # increment this value for each test you create
+use Test::Deep;
  
 my $session = WebGUI::Test->session;
  
@@ -33,6 +35,8 @@ isa_ok($style, 'WebGUI::Session::Style', 'session has correct object type');
 
 is($style->sent, undef, 'sent should start off being undefined at session creation');
 is($style->sent(1), '1', 'sent: set to true (1)');
+##This is checked indirectly by calling sent with no arguments
+is($session->stow->get('styleHeadSent'), 1, 'sent: stow variable set for style header sent');
 is($style->sent(), '1', 'sent: return true (1)');
 is($style->sent('gone'), 'gone', 'sent: set to true ("gone")');
 is($style->sent(), 'gone', 'sent: return true ("gone")');
@@ -41,11 +45,65 @@ $style->sent(0); ##Set to unsent to we don't trigger any other code, yet
 
 ####################################################
 #
-# setLink
+# setLink and generateAdditionalHeadTags
 #
 ####################################################
 
+my ($url, $params);
+
 is($style->setLink(), 0, 'setLink returns the result of the conditional check for already sent');
+($url) = simpleLinkParser('link', $style->generateAdditionalHeadTags);
+is($url, '-', 'setLink: called with no params or link url');
+
+is($style->generateAdditionalHeadTags(), undef, 'generateAdditionalHeadTags: returns undef since nothing has been set');
+
+$style->setLink('http://www.plainblack.com');
+($url) = simpleLinkParser('link', $style->generateAdditionalHeadTags);
+is($url, 'http://www.plainblack.com', 'setLink: called with link url');
+
+my $setParams = {rating => 5, affiliateId => '007', CAPS => 'CapitalS'};
+$style->setLink('http://www.webguidev.org', $setParams);
+is($style->setLink('http://www.webguidev.org'), undef, 'setLink: returns undef if URL is passed again');
+
+my $linkOutput = $style->generateAdditionalHeadTags;
+like($linkOutput, qr/affiliateId=/, 'setLink: param affiliateId present');
+like($linkOutput, qr/rating=/, 'setLink: param rating present');
+like($linkOutput, qr/CAPS=/, 'setLink: param rating present');
+($url, $params) = simpleLinkParser('link', $linkOutput);
+is($url, 'http://www.webguidev.org', 'setLink: called with link url and params');
+
+##TokeParse automatically lowercases all param names but not values
+my %setParams = map { lc($_) => $setParams->{$_} } keys %{ $setParams };
+cmp_deeply(\%setParams, $params, 'setLink: all params set correctly');
+
+TODO: {
+	local $TODO = "more setLink tests";
+	ok(0, 'check that more than one link tag can be set if they are unique URLs');
+	ok(0, 'check for immediate send if sent returns true');
+}
+
+####################################################
+#
+# setMeta and generateAdditionalHeadTags
+#
+####################################################
+
+is($style->setMeta(), 0, 'setMeta returns the result of the conditional check for already sent');
+($url, $params) = simpleLinkParser('meta', $style->generateAdditionalHeadTags);
+cmp_deeply($params, {}, 'setMeta: called with no params');
+
+sub simpleLinkParser {
+	my ($tokenName, $text) = @_;
+	my $p = HTML::TokeParser->new(\$text);
+
+	my $token = $p->get_tag($tokenName);
+	my $url = $token->[1]{href} || "-";
+	my $params = $token->[1];
+	delete $params->{href};
+	delete $params->{'/'};  ##delete unary slash from XHTML output
+
+	return ($url, $params);
+}
  
 END {
 }