Fixed the starter templates.
Updated test.