Added subject to metadata
Tests for generator