Scaffold Goal and fix tests
Merge pull request #5 from aliciafrench/master

Scaffold Goal and fix tests