Fixed to Pass tests from LRS_Validator