Refactoring/ Adding Tests for Validation