Fixing unit tests + adding repositories