Add tests for subject, guid, clean up example