Unit tests cleanup and renovations.