Fixed skipped unit tests