Scaffold Goal and fix tests