Unit tests cleaup