Add new tests part 2