Cleaned recently changed unit tests