diff --git a/t/SolarSystem.t b/t/SolarSystem.t
index 8c48426eb..9355474b1 100644
--- a/t/SolarSystem.t
+++ b/t/SolarSystem.t
@@ -4,66 +4,81 @@ use strict;
use warnings;
use Test::More;
use DDG::Test::Goodie;
-use DDG::GoodieRole::ImageLoader;
use DDG::Test::Location;
zci answer_type => "solarsystem";
zci is_cached => 1;
+#Structured answer template data
+my $templateData = {
+ data => '-ANY-',
+ id => "solar_system",
+ name => "Answer",
+ meta => {
+ sourceUrl => "https://solarsystem.nasa.gov/planets/index.cfm",
+ sourceName => "NASA"
+ },
+ templates => {
+ group => 'base',
+ options => {
+ content => 'DDH.solar_system.content',
+ }
+ }
+ };
+
ddg_goodie_test(
- [qw( DDG::Goodie::SolarSystem )],
+ [qw( DDG::Goodie::SolarSystem)],
#Test Imperial
+ "size earth" => test_zci("Earth - Radius is 3,958.8 mi", structured_answer => $templateData),
- 'size earth' => test_zci("Earth - Radius is 3,958.8 mi", html => qr{
3,958.8 miEarth - Radius }),
+ "what is the size of earth" => test_zci( "Earth - Radius is 3,958.8 mi", structured_answer => $templateData),
- 'what is the size of earth' => test_zci("Earth - Radius is 3,958.8 mi", html => qr{3,958.8 miEarth - Radius }),
-
- 'size of jupiter' => test_zci("Jupiter - Radius is 43,440.7 mi", html => qr{43,440.7 miJupiter - Radius }),
+ 'size of jupiter' => test_zci("Jupiter - Radius is 43,440.7 mi", structured_answer => $templateData),
- 'size of object jupiter' => test_zci("Jupiter - Radius is 43,440.7 mi", html => qr{43,440.7 miJupiter - Radius }),
+ 'size of object jupiter' => test_zci("Jupiter - Radius is 43,440.7 mi", structured_answer => $templateData),
- 'volume of mars' => test_zci("Mars - Volume is 39,133,515,914 mi3", html => qr{39,133,515,914 mi3Mars - Volume }),
+ 'volume of mars' => test_zci("Mars - Volume is 39,133,515,914 mi3", structured_answer => $templateData),
- 'surface area of mercury' => test_zci("Mercury - Surface Area is 28,879,000 mi2", html => qr{28,879,000 mi2Mercury - Surface Area }),
+ 'surface area of mercury' => test_zci("Mercury - Surface Area is 28,879,000 mi2", structured_answer => $templateData),
- 'mass of neptune' => test_zci("Neptune - Mass is 2.258 × 1026 lbs", html => qr{2.258 × 1026 lbsNeptune - Mass }),
+ 'mass of neptune' => test_zci("Neptune - Mass is 2.258 × 1026 lbs", structured_answer => $templateData),
- 'area of saturn' => test_zci("Saturn - Surface Area is 16,452,636,641 mi2", html => qr{16,452,636,641 mi2Saturn - Surface Area }),
+ 'area of saturn' => test_zci("Saturn - Surface Area is 16,452,636,641 mi2", structured_answer => $templateData),
- 'radius of uranus' => test_zci("Uranus - Radius is 15,759.2 mi", html => qr{15,759.2 miUranus - Radius }),
+ 'radius of uranus' => test_zci("Uranus - Radius is 15,759.2 mi", structured_answer => $templateData),
- 'size of venus' => test_zci("Venus - Radius is 3,760.4 mi", html => qr{3,760.4 miVenus - Radius }),
+ 'size of venus' => test_zci("Venus - Radius is 3,760.4 mi", structured_answer => $templateData),
- 'size of pluto' => test_zci("Pluto - Radius is 715.2 mi", html => qr{715.2 miPluto - Radius }),
+ 'size of pluto' => test_zci("Pluto - Radius is 715.2 mi", structured_answer => $templateData),
+
+ 'size of moon' => test_zci("Moon - Radius is 1,079.6 mi", structured_answer => $templateData),
- 'size of moon' => test_zci("Moon - Radius is 1,079.6 mi", html => qr{1,079.6 miMoon - Radius }),
#Test Metric
+ DDG::Request->new(query_raw => "size earth", location => test_location("au")) => test_zci("Earth - Radius is 6,371 km", structured_answer => $templateData),
- DDG::Request->new(query_raw => "size earth", location => test_location("au")) => test_zci("Earth - Radius is 6,371 km", html => qr{6,371 kmEarth - Radius }),
+ DDG::Request->new(query_raw => "what is the size of earth", location => test_location("au")) => test_zci("Earth - Radius is 6,371 km", structured_answer => $templateData),
- DDG::Request->new(query_raw => "what is the size of earth", location => test_location("au")) => test_zci("Earth - Radius is 6,371 km", html => qr{6,371 kmEarth - Radius }),
+ DDG::Request->new(query_raw => "size of jupiter", location => test_location("au")) => test_zci("Jupiter - Radius is 69,911 km", structured_answer => $templateData),
- DDG::Request->new(query_raw => "size of jupiter", location => test_location("au")) => test_zci("Jupiter - Radius is 69,911 km", html => qr{69,911 kmJupiter - Radius }),
+ DDG::Request->new(query_raw => "size of object jupiter", location => test_location("au")) => test_zci("Jupiter - Radius is 69,911 km", structured_answer => $templateData),
- DDG::Request->new(query_raw => "size of object jupiter", location => test_location("au")) => test_zci("Jupiter - Radius is 69,911 km", html => qr{69,911 kmJupiter - Radius }),
+ DDG::Request->new(query_raw => "volume of mars", location => test_location("au")) => test_zci("Mars - Volume is 163,115,609,799 km3", structured_answer => $templateData),
- DDG::Request->new(query_raw => "volume of mars", location => test_location("au")) => test_zci("Mars - Volume is 163,115,609,799 km3", html => qr{163,115,609,799 km3Mars - Volume }),
+ DDG::Request->new(query_raw => "surface area of mercury", location => test_location("au")) => test_zci("Mercury - Surface Area is 74,797,000 km2", structured_answer => $templateData),
- DDG::Request->new(query_raw => "surface area of mercury", location => test_location("au")) => test_zci("Mercury - Surface Area is 74,797,000 km2", html => qr{74,797,000 km2Mercury - Surface Area }),
+ DDG::Request->new(query_raw => "mass of neptune", location => test_location("au")) => test_zci("Neptune - Mass is 1.024 × 1026 kg", structured_answer => $templateData),
- DDG::Request->new(query_raw => "mass of neptune", location => test_location("au")) => test_zci("Neptune - Mass is 1.024 × 1026 kg", html => qr{1.024 × 1026 kgNeptune - Mass }),
+ DDG::Request->new(query_raw => "area of saturn", location => test_location("au")) => test_zci("Saturn - Surface Area is 42,612,133,285 km2", structured_answer => $templateData),
- DDG::Request->new(query_raw => "area of saturn", location => test_location("au")) => test_zci("Saturn - Surface Area is 42,612,133,285 km2", html => qr{42,612,133,285 km2Saturn - Surface Area }),
+ DDG::Request->new(query_raw => "radius of uranus", location => test_location("au")) => test_zci("Uranus - Radius is 25,362 km", structured_answer => $templateData),
- DDG::Request->new(query_raw => "radius of uranus", location => test_location("au")) => test_zci("Uranus - Radius is 25,362 km", html => qr{25,362 kmUranus - Radius }),
+ DDG::Request->new(query_raw => "size of venus", location => test_location("au")) => test_zci("Venus - Radius is 6,051.8 km", structured_answer => $templateData),
- DDG::Request->new(query_raw => "size of venus", location => test_location("au")) => test_zci("Venus - Radius is 6,051.8 km", html => qr{6,051.8 kmVenus - Radius }),
+ DDG::Request->new(query_raw => "size of pluto", location => test_location("au")) => test_zci("Pluto - Radius is 1,151 km", structured_answer => $templateData),
- DDG::Request->new(query_raw => "size of pluto", location => test_location("au")) => test_zci("Pluto - Radius is 1,151 km", html => qr{1,151 kmPluto - Radius }),
-
- DDG::Request->new(query_raw => "size of moon", location => test_location("au")) => test_zci("Moon - Radius is 1,737.5 km", html => qr{1,737.5 kmMoon - Radius }),
+ DDG::Request->new(query_raw => "size of moon", location => test_location("au")) => test_zci("Moon - Radius is 1,737.5 km", structured_answer => $templateData),
'size of tomato' => undef,
'volume of water' => undef,