Merge "Refactoring/ Adding Tests for Validation"