Merge "Reenabled the unit tests"