Testing rt-cvsgate refactoring