Fannar and Gretar having fun with unit tests
Merge commit '1ac593ad211065c18fc530260e98b55c268bff44'