Unit tests edited