[TEST] Minor polishing