refactoring and VP test increment