Minor systests refactorings