+Naval: Refactoring test and validation error