Added more unit-tests for FotM.Data