Unit testing: Added edge core tests part 2