[rnd-internal-api] some renaming and additional tests