adopted unit tests part 2