Added data repo unit tests + fixes