Fixed unit tests + disable it until it is fixed