Continued implementing core model (calculate emissions)

* Changed report output
* Updated tests