Cleaned up tests.

Improved building of Forecast object in preparation for v2