T2 tests done
Fixing unit tests