Unit tests update