Still fixing unitary tests