Unit tests modified to reflect code changes