Added tests. FIXTURE update.

Tests were added and some changes made to both entry view and the aggregation as a consequence.
An inflation test needed a fixture update so that the dataset would have a territory assigned to it (in order to be able to do inflation).