Merge "BUG-730: cleanup tests in pcep-impl"