Unit tests update and Setup