Fixed all unitTests