Unit tests correction