RTCL: Simple refactoring
test