Fixed unstable tests

The modified tests were sometimes failing due to
an unsorted result of elements from a database query.

Change-Id: I24f5fc4f8fd8ac902045471c71c7a64a316a3963
Added Modifications + LastOccurred as admin fields

Change-Id: I7973f1fc041ce4678ffe9de741a71a7c0812d5b1
Merge branch 'i'